projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2d6c39e) | patch
(smerge-diff-buffer-name): Default to *vc-diff*.
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 3 Sep 2002 01:20:20 +0000 (01:20 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 3 Sep 2002 01:20:20 +0000 (01:20 +0000)
commit667908d3f4e47f044d660126711a8ed8c46732a5
tree05ac3af5ef402c88e3e9fb2163c9692c355a6b3ftree | snapshot
parent2d6c39e1b077a743f0ce481627cef2379cfce033commit | diff
(smerge-diff-buffer-name): Default to *vc-diff*.
(smerge-combine-with-next): New function.
(smerge-diff): Don't output `wrote /tmp/foo' messages.
Insert message if no diffs were found.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.